From bfccb5759170180afd5c1b67b3e59048e646398f Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Wed, 7 Aug 2019 07:37:12 -0600
Subject: [PATCH] don't compile unwanted module serial_unix.cc on mac. (#388)

* don't compile serial_unix.cc on mac.

* remove unnecessary conditional in serial_unix.cc

File is no longer in SOURCES for mac, so we don't need to use a
conditional to skip the contents on mac.
---
 gui/app.pro        | 10 +++++++---
 gui/serial_unix.cc |  3 ---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/gui/app.pro b/gui/app.pro
index 3093de24d..cb1992bc0 100755
--- a/gui/app.pro
+++ b/gui/app.pro
@@ -84,9 +84,13 @@ SOURCES += preferences.cc
 SOURCES += processwait.cc
 SOURCES += upgrade.cc
 SOURCES += version_mismatch.cc
-macx:SOURCES += serial_mac.cc
-unix:SOURCES += serial_unix.cc
-windows:SOURCES += serial_win.cc
+unix:!mac {
+  SOURCES += serial_unix.cc
+} else:mac {
+  SOURCES += serial_mac.cc
+} else:windows {
+  SOURCES += serial_win.cc
+}
 
 HEADERS += aboutdlg.h
 HEADERS += advdlg.h
diff --git a/gui/serial_unix.cc b/gui/serial_unix.cc
index 4540c5d1e..47f39db8e 100644
--- a/gui/serial_unix.cc
+++ b/gui/serial_unix.cc
@@ -19,7 +19,6 @@
 //  USA.
 //
 #include "mainwindow.h"
-#if !defined (Q_OS_MAC) // FIXME: find a better way to hide this on Mac.
 
 #ifdef HAVE_UDEV
 #include <libudev.h>
@@ -104,5 +103,3 @@ void MainWindow::osLoadDeviceNameCombos(QComboBox* box)
     }
   }
 }
-
-#endif
-- 
2.30.2